Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Aine Longcoats #59

Merged
merged 28 commits into from
Jul 31, 2024
Merged

Aine Longcoats #59

merged 28 commits into from
Jul 31, 2024

Conversation

foxcumberland
Copy link
Contributor

@foxcumberland foxcumberland commented Jul 24, 2024

Description

Double-breasted longcoats for almost everyone! Includes one for each unit of Command, three for Security Staff (Corpsman, Warden, Secoff), and four general-purpose ones (Brown, Black, Nanotrasen and an Arashi Labs 'medical' colored one, and of course a green version of the Captain's for Central Command.

Command, Corpsman and Warden Longcoats are added to their respective lockers. The basic Armored Longcoat has two copies in the SecTech between the Durathread Vest and Plate Carrier (as it is statistically analagous to them) while the four general longcoats are in the ClothesMate.

Designs are in media.


TODO

Add at least the general longcoats to loadouts.

Possibly add Corporate Jacket versions, need to discuss item bloat at some point as adding a dozen jackets into the ClothesMate is going to make that list very, very long...


Media

Poster


Changelog

🆑

  • Adds Longcoats
    4 Common ones found in the clothesmate, Brown, Black, Nanotrasen, and an Arashi Labs 'medical cyan' one.
    4 Armored Sec ones, with Secoff Armored coats available in the SecTech and unique ones found in HoS, Brigmedic and Warden lockers, Detective vendor has a copy of the Armored longcoat as well as an unarmored Brown longcoat
    7 Command-colored ones to match their respective Cloaks: Captain, HoP, LO, RD, CMO, CE all have theirs available in their locker, and a Central Command one for admins.

@github-actions github-actions bot added Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files labels Jul 24, 2024
@Floof-Station-Bot Floof-Station-Bot changed the title Aine longcoats Aine Longcoats Jul 24, 2024
Copy link
Contributor

github-actions bot commented Jul 24, 2024

RSI Diff Bot; head commit e3a6d67 merging into 95a9304
This PR makes changes to 1 or more RSIs. Here is a summary of all changes:

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatAL.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatBlack.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatBrigmedic.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatBrown.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatCC.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatCE.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatCMO.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatCap.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatHoP.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatHoS.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatLO.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatNT.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatRD.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatSec.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatWarden.rsi

State Old New Status
equipped-OUTERCLOTHING Added
icon Added
inhand-left Added
inhand-right Added

Edit: diff updated after e3a6d67

@github-actions github-actions bot added the Status: Needs Review Someone please review this label Jul 25, 2024
@FoxxoTrystan FoxxoTrystan added the Priority: 2-Medium Needs to be resolved at some point label Jul 25, 2024
@FoxxoTrystan
Copy link
Collaborator

Before i do any changes, this PR feels its will fit better in upsteam: https://github.com/Simple-Station/Einstein-Engines/

I have run also the test and RSI seme angry, this will need fixes.

@FoxxoTrystan
Copy link
Collaborator

And changlog will need to be different please.

@foxcumberland
Copy link
Contributor Author

Before i do any changes, this PR feels its will fit better in upsteam: https://github.com/Simple-Station/Einstein-Engines/

I have run also the test and RSI seme angry, this will need fixes.

I won't lie, I have no idea what any of that or the other review stuff means yet, I have no idea what a fail means and I don't know if that's somehow something I added causing a break or something else.

Changelog can be made real, I just had my brain in the wrong space as to what the changelog was referencing (updates to the pr rather than updates to the master)

Probably could be done upstream but I don't need the anxiety of trying to publish something to a group that I don't know, to people that I don't have any real contact with yet or am comfortable asking for help, when I'm just figuring this stuff out.

Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Armor Stats need talk.
Copyright need to be set and not "modified later".
Comments are needed on Floof to not be overridden and so we know where its comes, follow suggestions.

Resources/Prototypes/Catalog/Fills/Lockers/heads.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Catalog/Fills/Lockers/heads.yml Outdated Show resolved Hide resolved
Resources/Prototypes/Catalog/Fills/Lockers/security.yml Outdated Show resolved Hide resolved
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Are the armor here normal? as if i remember we avoid to add armor mostly to civillians

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

suggestions committed. For the armor values, I figured it'd be cute to have, but if it's a problem, I don't mind removing those values entirely.

@FoxxoTrystan
Copy link
Collaborator

Before i do any changes, this PR feels its will fit better in upsteam: https://github.com/Simple-Station/Einstein-Engines/
I have run also the test and RSI seme angry, this will need fixes.

I won't lie, I have no idea what any of that or the other review stuff means yet, I have no idea what a fail means and I don't know if that's somehow something I added causing a break or something else.

Changelog can be made real, I just had my brain in the wrong space as to what the changelog was referencing (updates to the pr rather than updates to the master)

Probably could be done upstream but I don't need the anxiety of trying to publish something to a group that I don't know, to people that I don't have any real contact with yet or am comfortable asking for help, when I'm just figuring this stuff out.

I do wana note that upsteam is not wizden but upsteam.

foxcumberland and others added 14 commits July 24, 2024 18:19
@foxcumberland
Copy link
Contributor Author

I do wana note that upsteam is not wizden but upsteam.

I know it's not wizden, but otherwise this... just confused me. Is upstream not what we call the EE code/team, because That's what I was referring to when I meant people I don't know.

@FoxxoTrystan
Copy link
Collaborator

RSI / Linter test failed, click details and fix the issues displayed.
If unble to find the error, feel free to ping me on discord.

@Fansana
Copy link
Owner

Fansana commented Jul 25, 2024

I really like this. We can merge this upstream if need be that shouldn't be a problem.
Please fix the following errors so we can merge it
Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatAL.rsi: PNG not defined in metadata: Icon.png
Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatAL.rsi: icon: failed to open state icon.png

@FoxxoTrystan
Copy link
Collaborator

FoxxoTrystan commented Jul 29, 2024

RSI:
Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatAL.rsi: PNG not defined in metadata: Icon.png
Resources/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatAL.rsi: icon: failed to open state icon.png

YAML Linter:
Unable to load RSI '/Textures/Floof/Clothing/OuterClothing/WinterCoats/longcoatAL.rsi'.

Check failed tests for more information.

If your unable to do the fixes yourself i can do it myself if you wish.

@foxcumberland
Copy link
Contributor Author

foxcumberland commented Jul 31, 2024

RSI/YAML fixed, I believe. Got to love all that angry error text just for a simple filename capitalization goof.

Edit: Nevermiiind it was showing me green until it failed...

Copy link
Collaborator

@FoxxoTrystan FoxxoTrystan left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Linter still uhappy:

Error: /Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml(98,5) PrototypeID ClothingLongcoatNT for type Robust.Shared.Prototypes.EntityPrototype at Line: 98, Col: 5 not found
Error: /Prototypes/Catalog/VendingMachines/Inventories/clothesmate.yml(99,5) PrototypeID ClothingLongcoatAL for type Robust.Shared.Prototypes.EntityPrototype at Line: 99, Col: 5 not foun

@FoxxoTrystan
Copy link
Collaborator

RSI/YAML fixed, I believe. Got to love all that angry error text just for a simple filename capitalization goof.

Edit: Nevermiiind it was showing me green until it failed...

Yeah because its your first PR here, i have to aprove the tests myself.

@foxcumberland
Copy link
Contributor Author

Should be good now, LongcoatNT and LongcoatAL were newer names before that the files got but the prototype didn't.

@FoxxoTrystan FoxxoTrystan removed the Status: Needs Review Someone please review this label Jul 31, 2024
@FoxxoTrystan FoxxoTrystan merged commit 3c08f16 into Fansana:master Jul 31, 2024
12 of 13 checks passed
Floof-Station-Bot added a commit that referenced this pull request Jul 31, 2024
@foxcumberland foxcumberland deleted the Aine-Longcoats branch July 31, 2024 07:14
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Changes: Sprite Changes any png or json in an RSI Changes: YML Changes any yml files Priority: 2-Medium Needs to be resolved at some point
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants